atspi: Don't crash on unnamed stack pages
authorMatthias Clasen <mclasen@redhat.com>
Wed, 14 Oct 2020 23:05:36 +0000 (19:05 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Thu, 15 Oct 2020 01:04:25 +0000 (21:04 -0400)
GtkNotebook creates unnamed stack pages, and we should
not crash when that happens.

gtk/a11y/gtkatspicontext.c

index b6badc3bebdced22edb69176db1e302cbff73528..084c6a14bedfae542b825bff5908317e361dfc33 100644 (file)
@@ -568,9 +568,14 @@ handle_accessible_get_property (GDBusConnection       *connection,
       if (GTK_IS_WIDGET (accessible))
         res = g_variant_new_string (gtk_widget_get_name (GTK_WIDGET (accessible)));
       else if (GTK_IS_STACK_PAGE (accessible))
-        res = g_variant_new_string (gtk_stack_page_get_name (GTK_STACK_PAGE (accessible)));
+        {
+          const char *name = gtk_stack_page_get_name (GTK_STACK_PAGE (accessible));
+          if (name == NULL)
+             name = G_OBJECT_TYPE_NAME (accessible);
+          res = g_variant_new_string (name);
+        }
       else
-        res = g_variant_new_string ("Name");
+        res = g_variant_new_string (G_OBJECT_TYPE_NAME (accessible));
     }
   else if (g_strcmp0 (property_name, "Description") == 0)
     {